Fix up finalizer to chain to its parent.

Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize):
	Fix up finalizer to chain to its parent.

diff --git a/ChangeLog b/ChangeLog
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ce78b35cb445744685a00bc8480b4230394f6d81..de0a0e64d93b33c82644e0dffc5971c8ab4dc6d2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Dec 11 10:02:26 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_finalize): 
+       Fix up finalizer to chain to its parent.
+
 2000-12-11  Alexander Larsson  <alexl@redhat.com>
 
        * docs/README.linux-fb (GDK_KEYBOARD_TYPE):
@@ -115,8 +120,10 @@
        function, noticed by Alex
 
 2000-12-06  Elliot Lee  <sopwith@redhat.com>
+
        * configure.in: Detect freetype properly
-       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
+       * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of
+       above.
 
 2000-12-06  Alexander Larsson  <alexl@redhat.com>
 

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 78c254728ab287f5d465601cd2d1e3b30506697b..4b346dc9c34ca19b39b628eb51e06a7eda8b5664 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -802,7 +802,15 @@ gtk_im_context_simple_finalize (GObject *obj)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (obj);
 
-  g_slist_free (context_simple->tables);
+  if (context_simple->tables)
+    {
+      g_slist_foreach (context_simple->tables, (GFunc)g_free, NULL);
+      g_slist_free (context_simple->tables);
+
+      context_simple->tables = NULL;
+    }
+
+  parent_class->finalize (obj);
 }
 
 GtkIMContext *